bitkeeper revision 1.1236.1.147 (42490b0352incZSDDiAEv28xZljTkw)

Merge

diff --cc linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c
Simple merge

diff --cc tools/python/xen/lowlevel/xu/xu.c
index 22dd2bcd1965d475796b6e625d33264da676716e,79c18795c92b6030f7ce600f30e628ec6a070033..9fd148509cdc8924fd30d6e0c69f2fceb3f8ee38
--- 1/tools/python/xen/lowlevel/xu/xu.c
--- 2/tools/python/xen/lowlevel/xu/xu.c
+++ b/tools/python/xen/lowlevel/xu/xu.c
@@@ -972,53 -671,9 +972,56 @@@ static PyObject *xu_message_new(PyObjec
          P2C(mem_request_t, target, u32);
          P2C(mem_request_t, status, u32);
          break;
 +    case TYPE(CMSG_USBIF_FE, CMSG_USBIF_FE_INTERFACE_STATUS_CHANGED):
 +        P2C(usbif_fe_interface_status_changed_t, status, u32);
 +        P2C(usbif_fe_interface_status_changed_t, evtchn, u16);
 +        P2C(usbif_fe_interface_status_changed_t, domid, domid_t);
 +        P2C(usbif_fe_interface_status_changed_t, bandwidth, u32);
 +      P2C(usbif_fe_interface_status_changed_t, num_ports, u32);
 +        break;
 +    case TYPE(CMSG_USBIF_FE, CMSG_USBIF_FE_DRIVER_STATUS_CHANGED):
 +        P2C(usbif_fe_driver_status_changed_t, status, u32);
 +        break;
 +    case TYPE(CMSG_USBIF_FE, CMSG_USBIF_FE_INTERFACE_CONNECT):
 +        P2C(usbif_fe_interface_connect_t, shmem_frame, memory_t);
 +        break;
 +    case TYPE(CMSG_USBIF_FE, CMSG_USBIF_FE_INTERFACE_DISCONNECT):
 +        break;
 +    case TYPE(CMSG_USBIF_BE, CMSG_USBIF_BE_CREATE):
 +        P2C(usbif_be_create_t, domid, domid_t);
 +        P2C(usbif_be_create_t, status, u32);
 +        break;
 +    case TYPE(CMSG_USBIF_BE, CMSG_USBIF_BE_DESTROY):
 +        P2C(usbif_be_destroy_t, domid, domid_t);
 +        P2C(usbif_be_destroy_t, status, u32);
 +        break;
 +    case TYPE(CMSG_USBIF_BE, CMSG_USBIF_BE_CONNECT):
 +        P2C(usbif_be_connect_t, domid, domid_t);
 +        P2C(usbif_be_connect_t, shmem_frame, memory_t);
 +        P2C(usbif_be_connect_t, evtchn, u32);
 +        P2C(usbif_be_connect_t, bandwidth, u32);
 +        P2C(usbif_be_connect_t, status, u32);
 +        break;
 +    case TYPE(CMSG_USBIF_BE, CMSG_USBIF_BE_DISCONNECT):
 +        P2C(usbif_be_disconnect_t, domid, domid_t);
 +        P2C(usbif_be_disconnect_t, status, u32);
 +        break;
 +    case TYPE(CMSG_USBIF_BE, CMSG_USBIF_BE_DRIVER_STATUS_CHANGED):
 +        P2C(usbif_be_driver_status_changed_t, status, u32);
 +        break;
 +    case TYPE(CMSG_USBIF_BE, CMSG_USBIF_BE_CLAIM_PORT):
 +        P2C(usbif_be_claim_port_t, domid, domid_t);
 +        P2C(usbif_be_claim_port_t, usbif_port, u32);
 +        P2C(usbif_be_claim_port_t, status, u32);
 +        PSTR2CHAR(usbif_be_claim_port_t, path);
 +        printf("dict items parsed = %d", dict_items_parsed);
 +        break;
 +    case TYPE(CMSG_USBIF_BE, CMSG_USBIF_BE_RELEASE_PORT):
 +        PSTR2CHAR(usbif_be_release_port_t, path);
 +        break;
+     case TYPE(CMSG_SHUTDOWN, CMSG_SHUTDOWN_SYSRQ):
+         P2C(shutdown_sysrq_t, key, char);
+         break;
      }
  
      if ( dict_items_parsed != PyDict_Size(payload) )

diff --cc xen/include/public/io/domain_controller.h
Simple merge